Shuffle test suite around some more, fixing order of COMPARE arguments,

splitting things into smaller files as we go.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4314 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/testo.d/alantrl.test b/gpsbabel/testo.d/alantrl.test
new file mode 100644 (file)
index 0000000..8c655eb
--- /dev/null
+++ b/gpsbabel/testo.d/alantrl.test
@@ -0,0 +1,8 @@
+#
+# Alan Map500 tracklogs< test
+#
+rm -f ${TMPDIR}/alantrl*
+gpsbabel -i alantrl -f ${REFERENCE}/alantrl.trl -o alantrl -F ${TMPDIR}/alantrl-new.trl
+gpsbabel -i alantrl -f ${TMPDIR}/alantrl-new.trl -o gpx -F ${TMPDIR}/alantrl-new.gpx
+compare ${REFERENCE}/alantrl.gpx ${TMPDIR}/alantrl-new.gpx 
+

diff --git a/gpsbabel/testo.d/alanwpr.test b/gpsbabel/testo.d/alanwpr.test
new file mode 100644 (file)
index 0000000..ccb364f
--- /dev/null
+++ b/gpsbabel/testo.d/alanwpr.test
@@ -0,0 +1,8 @@
+#
+# Alan MAp500 waypoint & route test
+#
+rm -f ${TMPDIR}/alanwpr*
+gpsbabel -i alanwpr -f ${REFERENCE}/alanwpr.wpr -o alanwpr -F ${TMPDIR}/alanwpr-new.wpr
+gpsbabel -i alanwpr -f ${TMPDIR}/alanwpr-new.wpr -o gpx -F ${TMPDIR}/alanwpr-new.gpx
+compare ${REFERENCE}/alanwpr.gpx ${TMPDIR}/alanwpr-new.gpx 
+

diff --git a/gpsbabel/testo.d/classic-3.test b/gpsbabel/testo.d/classic-3.test
index 8720be9d1ef6846ad0529b9cb225c76ad82796df..cc399287a975c8aa9241a7def497617e1d86d485 100644 (file)
--- a/gpsbabel/testo.d/classic-3.test
+++ b/gpsbabel/testo.d/classic-3.test
@@ -157,23 +157,6 @@ compare ${TMPDIR}/raymarine-sample.gpx ${REFERENCE}/raymarine-sample.gpx
 gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -o raymarine -F ${TMPDIR}/expertgps.rwf
 compare ${TMPDIR}/expertgps.rwf ${REFERENCE}/expertgps.rwf
 
-
-#
-# Alan MAp500 waypoint & route test
-#
-rm -f ${TMPDIR}/alanwpr*
-gpsbabel -i alanwpr -f ${REFERENCE}/alanwpr.wpr -o alanwpr -F ${TMPDIR}/alanwpr-new.wpr
-gpsbabel -i alanwpr -f ${TMPDIR}/alanwpr-new.wpr -o gpx -F ${TMPDIR}/alanwpr-new.gpx
-compare ${TMPDIR}/alanwpr-new.gpx ${REFERENCE}/alanwpr.gpx
-
-#
-# Alan Map500 tracklogs< test
-#
-rm -f ${TMPDIR}/alantrl*
-gpsbabel -i alantrl -f ${REFERENCE}/alantrl.trl -o alantrl -F ${TMPDIR}/alantrl-new.trl
-gpsbabel -i alantrl -f ${TMPDIR}/alantrl-new.trl -o gpx -F ${TMPDIR}/alantrl-new.gpx
-compare ${TMPDIR}/alantrl-new.gpx ${REFERENCE}/alantrl.gpx
-
 #
 # VITO SmartMap .vtt track file 'vitovtt' test
 #
@@ -181,13 +164,6 @@ rm -f ${TMPDIR}/vitovtt-*
 gpsbabel -i vitovtt -f ${REFERENCE}/track/vitovtt-sample.vtt -o gpx -F ${TMPDIR}/vitovtt-sample.gpx
 compare ${REFERENCE}/track/vitovtt-sample.gpx ${TMPDIR}/vitovtt-sample.gpx
 
-#
-# Test > 1 URL in selected files.
-#
-rm -f ${TMPDIR}/mlink*
-gpsbabel -i gpx -f ${REFERENCE}/multiple-links.gpx -o gpx,gpxver=1.1 -F ${TMPDIR}/mlink-1.gpx
-compare ${REFERENCE}/multiple-links.gpx ${TMPDIR}/mlink-1.gpx 
-
 #
 # Geogrid Viewer tracklogs
 #

diff --git a/gpsbabel/testo.d/classic-4.test b/gpsbabel/testo.d/classic-4.test
index 5c5b8945379ebf31e7429cfced2abc3d5a2011a2..ddc93c1b57be66d58617b254a06483b908e9c336 100644 (file)
--- a/gpsbabel/testo.d/classic-4.test
+++ b/gpsbabel/testo.d/classic-4.test
@@ -1,21 +1,4 @@
 #!/bin/sh
-
-#
-# Nokia  LMX
-#
-gpsbabel -i lmx -f ${REFERENCE}/nokia.lmx -o lmx -F ${TMPDIR}/nokia.lmx
-compare ${REFERENCE}/nokia.lmx ${TMPDIR}/nokia.lmx
-gpsbabel -i lmx -f ${REFERENCE}/nokia.lmx -o lmx,binary -F ${TMPDIR}/binary.lmx
-bincompare ${REFERENCE}/binary.lmx ${TMPDIR}/binary.lmx
-
-#
-# Swiss Map (.xol) tests
-#
-gpsbabel -i xol -f ${REFERENCE}/xol-sample.xol -o gpx -F ${TMPDIR}/xol-sample.gpx
-compare ${TMPDIR}/xol-sample.gpx ${REFERENCE}/xol-sample.gpx
-gpsbabel -i gpx -f ${REFERENCE}/xol-sample.gpx -o xol -F ${TMPDIR}/xol-sample-gpx.xol
-compare ${TMPDIR}/xol-sample-gpx.xol ${REFERENCE}/xol-sample-gpx.xol
-
 #
 # NaviLink waypoints
 #
@@ -103,45 +86,12 @@ compare ${TMPDIR}/${GoPalName}.tst2 ${TMPDIR}/${GoPalName}.tst3
 gpsbabel -i gopal -f ${REFERENCE}/gopal-11.trk -o gpx -F ${TMPDIR}/gopal-11-gpx.gpx
 compare ${TMPDIR}/gopal-11-gpx.gpx ${REFERENCE}/gopal-11-gpx.gpx
 
-#
-# Height filter
-#
-rm -f ${TMPDIR}/height_out.gpx
-gpsbabel -i gpx -f ${REFERENCE}/track/height.gpx \
-               -x height,wgs84tomsl,add=100m  \
-               -o gpx -F ${TMPDIR}/height_out.gpx
-compare ${TMPDIR}/height_out.gpx ${REFERENCE}/track/height_out.gpx
-rm -f ${TMPDIR}/height_out.csv
-gpsbabel -i unicsv -f ${REFERENCE}/heightcheck.csv \
-               -x height,wgs84tomsl  \
-               -o xcsv,style=${REFERENCE}/heightcheck.style -F ${TMPDIR}/height_out.csv
-compare ${TMPDIR}/height_out.csv ${REFERENCE}/heightcheck_out.csv
-
 #
 # iBlue747 (style) track files
 #
 gpsbabel -i iblue747 -f ${REFERENCE}/track/iblue747.csv -o gpx -F ${TMPDIR}/iblue747~csv.gpx
 compare ${REFERENCE}/track/iblue747~csv.gpx ${TMPDIR}/iblue747~csv.gpx
 
-#
-# Humminbird waypoints/routes
-#
-gpsbabel -i humminbird -f ${REFERENCE}/humminbird.hwr -o unicsv,utc=0 -F ${TMPDIR}/humminbird~hwr.csv
-compare ${REFERENCE}/humminbird~hwr.csv ${TMPDIR}/humminbird~hwr.csv
-gpsbabel -i humminbird -f ${REFERENCE}/humminbird.hwr -o humminbird -F ${TMPDIR}/humminbird.hwr
-bincompare ${REFERENCE}/humminbird.hwr ${TMPDIR}/humminbird.hwr
-gpsbabel -i humminbird -f ${REFERENCE}/route/humminbird.hwr -o gpx -F ${TMPDIR}/humminbird~hwr.gpx
-compare ${REFERENCE}/route/humminbird~hwr.gpx ${TMPDIR}/humminbird~hwr.gpx
-#
-# Humminbird tracks
-#
-gpsbabel -i humminbird -f ${REFERENCE}/track/humminbird.ht -o humminbird_ht -F ${TMPDIR}/humminbird.ht
-bincompare ${REFERENCE}/track/humminbird.ht ${TMPDIR}/humminbird.ht
-
-gpsbabel -i humminbird -f ${REFERENCE}/humminbird.hwr -f ${REFERENCE}/track/humminbird.ht -o gpx,humminbirdextensions=1 -F ${TMPDIR}/combo.gpx
-gpsbabel -i gpx -f ${TMPDIR}/combo.gpx -o humminbird -F ${TMPDIR}/funky.hwr -o humminbird_ht -F ${TMPDIR}/funky.ht
-bincompare ${REFERENCE}/humminbird.hwr ${TMPDIR}/funky.hwr
-bincompare ${REFERENCE}/track/humminbird.ht ${TMPDIR}/funky.ht 
 
 #
 # Google Navigator tracklines
@@ -296,24 +246,3 @@ compare ${REFERENCE}/route/naviguide.gpx ${TMPDIR}/naviguide.gpx
 gpsbabel -i gpx -f ${REFERENCE}/ics.gpx -o naviguide -F ${TMPDIR}/ics.gpx.naviguide
 gpsbabel -i naviguide -f ${TMPDIR}/ics.gpx.naviguide -o gpx -F ${TMPDIR}/ics.gpx.naviguide.gpx
 compare ${REFERENCE}/ics.gpx.naviguide.gpx ${TMPDIR}/ics.gpx.naviguide.gpx
-
-#
-# Basic VPL test
-#
-gpsbabel -i vpl -f ${REFERENCE}/track/vpl_reference.vpl -o gpx -F ${TMPDIR}/vpl_reference.gpx
-compare ${TMPDIR}/vpl_reference.gpx ${REFERENCE}/track/vpl_reference.gpx
-
-#
-# Teletype tests
-#
-rm -f ${TMPDIR}/teletype.*
-gpsbabel -i teletype -f ${REFERENCE}/track/teletype.way -o gpx -F ${TMPDIR}/teletype.gpx
-compare ${TMPDIR}/teletype.gpx ${REFERENCE}/track/teletype.gpx
-
-#
-# Jogmap XML tests
-#
-rm -f ${TMPDIR}/jogmap.*
-gpsbabel -i jogmap -f ${REFERENCE}/track/jogmap.xml -o gpx -F ${TMPDIR}/jogmap.gpx
-compare ${TMPDIR}/jogmap.gpx ${REFERENCE}/track/jogmap-gpx.gpx
-

diff --git a/gpsbabel/testo.d/height.test b/gpsbabel/testo.d/height.test
new file mode 100644 (file)
index 0000000..5c20d93
--- /dev/null
+++ b/gpsbabel/testo.d/height.test
@@ -0,0 +1,14 @@
+#
+# Height filter
+#
+rm -f ${TMPDIR}/height_out.gpx
+gpsbabel -i gpx -f ${REFERENCE}/track/height.gpx \
+               -x height,wgs84tomsl,add=100m  \
+               -o gpx -F ${TMPDIR}/height_out.gpx
+compare ${REFERENCE}/track/height_out.gpx ${TMPDIR}/height_out.gpx 
+rm -f ${TMPDIR}/height_out.csv
+
+gpsbabel -i unicsv -f ${REFERENCE}/heightcheck.csv \
+               -x height,wgs84tomsl  \
+               -o xcsv,style=${REFERENCE}/heightcheck.style -F ${TMPDIR}/height_out.csv
+compare ${REFERENCE}/heightcheck_out.csv ${TMPDIR}/height_out.csv 

diff --git a/gpsbabel/testo.d/humminbird.test b/gpsbabel/testo.d/humminbird.test
new file mode 100644 (file)
index 0000000..4f60033
--- /dev/null
+++ b/gpsbabel/testo.d/humminbird.test
@@ -0,0 +1,19 @@
+#
+# Humminbird waypoints/routes
+#
+gpsbabel -i humminbird -f ${REFERENCE}/humminbird.hwr -o unicsv,utc=0 -F ${TMPDIR}/humminbird~hwr.csv
+compare ${REFERENCE}/humminbird~hwr.csv ${TMPDIR}/humminbird~hwr.csv
+gpsbabel -i humminbird -f ${REFERENCE}/humminbird.hwr -o humminbird -F ${TMPDIR}/humminbird.hwr
+bincompare ${REFERENCE}/humminbird.hwr ${TMPDIR}/humminbird.hwr
+gpsbabel -i humminbird -f ${REFERENCE}/route/humminbird.hwr -o gpx -F ${TMPDIR}/humminbird~hwr.gpx
+compare ${REFERENCE}/route/humminbird~hwr.gpx ${TMPDIR}/humminbird~hwr.gpx
+#
+# Humminbird tracks
+#
+gpsbabel -i humminbird -f ${REFERENCE}/track/humminbird.ht -o humminbird_ht -F ${TMPDIR}/humminbird.ht
+bincompare ${REFERENCE}/track/humminbird.ht ${TMPDIR}/humminbird.ht
+
+gpsbabel -i humminbird -f ${REFERENCE}/humminbird.hwr -f ${REFERENCE}/track/humminbird.ht -o gpx,humminbirdextensions=1 -F ${TMPDIR}/combo.gpx
+gpsbabel -i gpx -f ${TMPDIR}/combo.gpx -o humminbird -F ${TMPDIR}/funky.hwr -o humminbird_ht -F ${TMPDIR}/funky.ht
+bincompare ${REFERENCE}/humminbird.hwr ${TMPDIR}/funky.hwr
+bincompare ${REFERENCE}/track/humminbird.ht ${TMPDIR}/funky.ht 

diff --git a/gpsbabel/testo.d/jogmap.test b/gpsbabel/testo.d/jogmap.test
new file mode 100644 (file)
index 0000000..f935804
--- /dev/null
+++ b/gpsbabel/testo.d/jogmap.test
@@ -0,0 +1,7 @@
+#
+# Jogmap XML tests
+#
+rm -f ${TMPDIR}/jogmap.*
+gpsbabel -i jogmap -f ${REFERENCE}/track/jogmap.xml -o gpx -F ${TMPDIR}/jogmap.gpx
+compare ${REFERENCE}/track/jogmap-gpx.gpx ${TMPDIR}/jogmap.gpx 
+

diff --git a/gpsbabel/testo.d/lmx.test b/gpsbabel/testo.d/lmx.test
new file mode 100644 (file)
index 0000000..072e109
--- /dev/null
+++ b/gpsbabel/testo.d/lmx.test
@@ -0,0 +1,9 @@
+
+#
+# Nokia  LMX
+#
+gpsbabel -i lmx -f ${REFERENCE}/nokia.lmx -o lmx -F ${TMPDIR}/nokia.lmx
+compare ${REFERENCE}/nokia.lmx ${TMPDIR}/nokia.lmx
+gpsbabel -i lmx -f ${REFERENCE}/nokia.lmx -o lmx,binary -F ${TMPDIR}/binary.lmx
+bincompare ${REFERENCE}/binary.lmx ${TMPDIR}/binary.lmx
+

diff --git a/gpsbabel/testo.d/multiurlgpx.test b/gpsbabel/testo.d/multiurlgpx.test
new file mode 100644 (file)
index 0000000..586aa42
--- /dev/null
+++ b/gpsbabel/testo.d/multiurlgpx.test
@@ -0,0 +1,7 @@
+#
+# Test > 1 URL in selected files.
+#
+rm -f ${TMPDIR}/mlink*
+gpsbabel -i gpx -f ${REFERENCE}/multiple-links.gpx -o gpx,gpxver=1.1 -F ${TMPDIR}/mlink-1.gpx
+compare ${REFERENCE}/multiple-links.gpx ${TMPDIR}/mlink-1.gpx 
+

diff --git a/gpsbabel/testo.d/teletype.test b/gpsbabel/testo.d/teletype.test
new file mode 100644 (file)
index 0000000..f2c9e03
--- /dev/null
+++ b/gpsbabel/testo.d/teletype.test
@@ -0,0 +1,7 @@
+#
+# Teletype tests
+#
+rm -f ${TMPDIR}/teletype.*
+gpsbabel -i teletype -f ${REFERENCE}/track/teletype.way -o gpx -F ${TMPDIR}/teletype.gpx
+compare ${REFERENCE}/track/teletype.gpx ${TMPDIR}/teletype.gpx 
+

diff --git a/gpsbabel/testo.d/vitovtt.test b/gpsbabel/testo.d/vitovtt.test
new file mode 100644 (file)
index 0000000..b1bd7cc
--- /dev/null
+++ b/gpsbabel/testo.d/vitovtt.test
@@ -0,0 +1,6 @@
+#
+# VITO SmartMap .vtt track file 'vitovtt' test
+#
+rm -f ${TMPDIR}/vitovtt-*
+gpsbabel -i vitovtt -f ${REFERENCE}/track/vitovtt-sample.vtt -o gpx -F ${TMPDIR}/vitovtt-sample.gpx
+compare ${REFERENCE}/track/vitovtt-sample.gpx ${TMPDIR}/vitovtt-sample.gpx

diff --git a/gpsbabel/testo.d/vpl.test b/gpsbabel/testo.d/vpl.test
new file mode 100644 (file)
index 0000000..247ffcf
--- /dev/null
+++ b/gpsbabel/testo.d/vpl.test
@@ -0,0 +1,6 @@
+
+#
+# Basic VPL test
+#
+gpsbabel -i vpl -f ${REFERENCE}/track/vpl_reference.vpl -o gpx -F ${TMPDIR}/vpl_reference.gpx
+compare ${REFERENCE}/track/vpl_reference.gpx ${TMPDIR}/vpl_reference.gpx 

diff --git a/gpsbabel/testo.d/xol.test b/gpsbabel/testo.d/xol.test
new file mode 100644 (file)
index 0000000..b29992f
--- /dev/null
+++ b/gpsbabel/testo.d/xol.test
@@ -0,0 +1,9 @@
+#
+# Swiss Map (.xol) tests
+#
+gpsbabel -i xol -f ${REFERENCE}/xol-sample.xol -o gpx -F ${TMPDIR}/xol-sample.gpx
+compare ${REFERENCE}/xol-sample.gpx ${TMPDIR}/xol-sample.gpx 
+
+gpsbabel -i gpx -f ${REFERENCE}/xol-sample.gpx -o xol -F ${TMPDIR}/xol-sample-gpx.xol
+compare ${REFERENCE}/xol-sample-gpx.xol ${TMPDIR}/xol-sample-gpx.xol 
+